Merge changes from emacs-23 branch.
authorChong Yidong <cyd@stupidchicken.com>
Fri, 16 Jul 2010 15:42:15 +0000 (11:42 -0400)
committerChong Yidong <cyd@stupidchicken.com>
Fri, 16 Jul 2010 15:42:15 +0000 (11:42 -0400)
commit6ad25ce489a0c74d5547587e19e037448991c218
treecbf97f7b370d123b5ef44ba1a80711d79042b6be
parentc7b419c2e257f130fd98f02d48c81469957be1ee
parenta22f4ec94a7f84ff2c4b6c1475fd11fac1a402f5
Merge changes from emacs-23 branch.
lisp/ChangeLog
lisp/simple.el
lisp/vc/vc.el
src/ChangeLog
src/gtkutil.c
src/gtkutil.h
src/w32fns.c
src/xfns.c
src/xmenu.c
src/xterm.c
src/xterm.h